tests/client/graphics/RadialMenuElements.test.ts (1)

352-442: Good coverage for the new ally_extend element.

The four tests cover visibility (in/out of extension window) and enabled/disabled states cleanly.

One small note: the allyPlayer mock object is copy-pasted across all four tests. You could extract a small helper like createAllyPlayer() to reduce repetition, but this is a minor nit for test code.

♻️ Optional: extract shared mock

+    function createAllyPlayer(): PlayerView {
+      return {
+        id: () => 2,
+        isAlliedWith: vi.fn(() => true),
+        isPlayer: vi.fn(() => true),
+      } as unknown as PlayerView;
+    }
+
     it("should show extend element when inAllianceExtensionWindow is true", () => {
-      const allyPlayer = {
-        id: () => 2,
-        isAlliedWith: vi.fn(() => true),
-        isPlayer: vi.fn(() => true),
-      } as unknown as PlayerView;
+      const allyPlayer = createAllyPlayer();
       mockParams.selected = allyPlayer;

Apply the same pattern for the other three tests.

src/client/graphics/layers/RadialMenu.ts (1)

362-371: Fragile fadedColor string manipulation, duplicated in two places.

The pattern .replace("rgb", "rgba").replace(")", , ${opacity})) assumes d3.interpolateRgb always returns "rgb(r, g, b)". If the input or output ever includes rgba(...), the first replace produces "rgbaa(...)". This logic also appears twice (in renderPaths and refresh).

Consider using d3.color(...).copy({ opacity }) which is already used elsewhere in this file, or extract a small helper.

♻️ Safer color with opacity

+function colorWithOpacity(baseColor: string, fadeFactor: number, opacity: number): string {
+  const parsed = d3.color(baseColor);
+  if (!parsed) return baseColor;
+  const faded = d3.color(d3.interpolateRgb(parsed.toString(), "white")(fadeFactor));
+  return faded?.copy({ opacity })?.toString() ?? baseColor;
+}

Then replace both occurrences:

-const fadedColor = parsed
-  ? d3.interpolateRgb(parsed.toString(), "white")(0.4)
-      .replace("rgb", "rgba")
-      .replace(")", `, ${opacity})`)
-  : normalColor;
+const fadedColor = colorWithOpacity(baseColor, 0.4, opacity);

Also applies to: 1175-1186

src/core/GameRunner.ts (1)

210-228: Alliance extension fields look correct.

The logic for inAllianceExtensionWindow, myPlayerAgreedToExtend, and otherPlayerAgreedToExtend is clear and well-structured.

One small nit: the as Player casts on lines 216 and 227 are redundant — other is already typed as Player from line 204. Removing them keeps the code cleaner.

♻️ Remove redundant casts

-      const alliance = player.allianceWith(other as Player);
+      const alliance = player.allianceWith(other);
       if (alliance) {
         actions.interaction.allianceExpiresAt = alliance.expiresAt();
         const inWindow =
           alliance.expiresAt() <=
           this.game.ticks() +
             this.game.config().allianceExtensionPromptOffset();
         actions.interaction.inAllianceExtensionWindow = inWindow;
         actions.interaction.myPlayerAgreedToExtend =
           alliance.agreedToExtend(player);
-        actions.interaction.otherPlayerAgreedToExtend = alliance.agreedToExtend(
-          other as Player,
-        );
+        actions.interaction.otherPlayerAgreedToExtend =
+          alliance.agreedToExtend(other);
       }

src/client/graphics/layers/RadialMenu.ts (2)

1167-1194: Duplicated timer-gradient color logic — extract a helper.

The faded/normal color computation and gradient stop update logic here is nearly identical to lines 352–401 in renderPaths. Extracting a small helper (e.g. computeTimerGradientColors(baseColor, opacity)) that returns { normalColor, fadedColor } would remove the duplication and make both call sites easier to maintain.

---

354-356: Dead condition: this.params === null is always false here.

Line 354 already guards this.params as truthy, so the this.params === null check on line 356 can never be true inside this block. Just use d.data.disabled(this.params) directly.

♻️ Simplify

     arcs.each((d) => {
       if (d.data.timerFraction && this.params) {
         const fraction = d.data.timerFraction(this.params);
-        const disabled = this.params === null || d.data.disabled(this.params);
+        const disabled = d.data.disabled(this.params);